diff --git a/sci-electronics/bsc/bsc-0_pre20210124.ebuild b/sci-electronics/bluespec/bluespec-0_pre20210124.ebuild
similarity index 68%
rename from sci-electronics/bsc/bsc-0_pre20210124.ebuild
rename to sci-electronics/bluespec/bluespec-0_pre20210124.ebuild
index a91a917c9d..bff19b5f44 100644
--- a/sci-electronics/bsc/bsc-0_pre20210124.ebuild
+++ b/sci-electronics/bluespec/bluespec-0_pre20210124.ebuild
@@ -6,20 +6,20 @@ EAPI=7
 DESCRIPTION="Bluespec high level hardware design language compiler"
 HOMEPAGE="https://github.com/B-Lang-org/bsc"
 
-# This inherit git-r3 will removed after upstream finished.
-inherit git-r3
-
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"
+	EGIT_REPO_URI="https://github.com/B-Lang-org/bsc.git"
+	inherit git-r3
 else
 	EGIT_COMMIT="69dee0667e51108832b685511e9aa631cca1e83a"
 	# Using SRC_URI here will failed because this repo uses git submodules.
-	# SRC_URI="https://github.com/B-Lang-org/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	# S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	# SRC_URI="https://github.com/B-Lang-org/bsc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	# S="${WORKDIR}/bsc-${EGIT_COMMIT}"
 	# Waiting for https://github.com/B-Lang-org/bsc/issues/85
-	EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"
+	EGIT_REPO_URI="https://github.com/B-Lang-org/bsc.git"
+	# This inherit git-r3 will removed after upstream finished.
+	inherit git-r3
 
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD GPL-3+ MIT"
@@ -64,7 +64,7 @@ DOCS=( "README.md" "COPYING" )
 src_compile() { :; }
 
 src_install() {
-	emake PREFIX="${ED}"/usr LIBDIR="${ED}"/usr/$(get_libdir) install
-	emake -C src/comp PREFIX="${ED}"/usr LIBDIR="${ED}"/usr/$(get_libdir) install-extra
+	emake PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install
+	emake -C src/comp PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install-extra
 	einstalldocs
 }
diff --git a/sci-electronics/bsc/bsc-9999.ebuild b/sci-electronics/bluespec/bluespec-9999.ebuild
similarity index 84%
rename from sci-electronics/bsc/bsc-9999.ebuild
rename to sci-electronics/bluespec/bluespec-9999.ebuild
index 4581c8485d..5769c1fbc2 100644
--- a/sci-electronics/bsc/bsc-9999.ebuild
+++ b/sci-electronics/bluespec/bluespec-9999.ebuild
@@ -6,11 +6,9 @@ EAPI=7
 DESCRIPTION="Bluespec high level hardware design language compiler"
 HOMEPAGE="https://github.com/B-Lang-org/bsc"
 
-# This inherit git-r3 will removed after upstream finished.
-inherit git-r3
-
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"
+	inherit git-r3
 else
 	EGIT_COMMIT="69dee0667e51108832b685511e9aa631cca1e83a"
 	# Using SRC_URI here will failed because this repo uses git submodules.
@@ -18,6 +16,8 @@ else
 	# S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 	# Waiting for https://github.com/B-Lang-org/bsc/issues/85
 	EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"
+	# This inherit git-r3 will removed after upstream finished.
+	inherit git-r3
 
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -64,7 +64,7 @@ DOCS=( "README.md" "COPYING" )
 src_compile() { :; }
 
 src_install() {
-	emake PREFIX="${ED}"/usr LIBDIR="${ED}"/usr/$(get_libdir) install
-	emake -C src/comp PREFIX="${ED}"/usr LIBDIR="${ED}"/usr/$(get_libdir) install-extra
+	emake PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install
+	emake -C src/comp PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install-extra
 	einstalldocs
 }
diff --git a/sci-electronics/bsc/files/bsc-0_pre20210106-fix-libdir.patch b/sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-libdir.patch
similarity index 100%
rename from sci-electronics/bsc/files/bsc-0_pre20210106-fix-libdir.patch
rename to sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-libdir.patch
diff --git a/sci-electronics/bsc/files/bsc-0_pre20210106-fix-wrapper.patch b/sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-wrapper.patch
similarity index 100%
rename from sci-electronics/bsc/files/bsc-0_pre20210106-fix-wrapper.patch
rename to sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-wrapper.patch
diff --git a/sci-electronics/bsc/metadata.xml b/sci-electronics/bluespec/metadata.xml
similarity index 88%
rename from sci-electronics/bsc/metadata.xml
rename to sci-electronics/bluespec/metadata.xml
index 826f1f530c..27738d5e22 100644
--- a/sci-electronics/bsc/metadata.xml
+++ b/sci-electronics/bluespec/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>vowstar@gmail.com</email>