diff --git a/bench/bench_flashrom_controller.vhd b/bench/bench_flashrom_controller.vhd
index 74f662f..9304a58 100644
--- a/bench/bench_flashrom_controller.vhd
+++ b/bench/bench_flashrom_controller.vhd
@@ -33,7 +33,7 @@ architecture rtl of bench_flashrom_controller is
 	end procedure strobe;
 	signal clr               : std_logic;
 	signal ready             : std_logic;
-	signal page              : std_logic_vector(FLASHROM_ADDR_WIDTH - 1 downto 0);
+	signal page              : std_logic_vector(FLASHROM_PAGE_ADDR_WIDTH - 1 downto 0);
 	signal sync_stb          : std_logic;
 	signal load_stb          : std_logic;
 	signal status_update_stb : std_logic;
diff --git a/cores/flashrom-wb/flashrom_controller.vhd b/cores/flashrom-wb/flashrom_controller.vhd
index fa322d8..b661913 100644
--- a/cores/flashrom-wb/flashrom_controller.vhd
+++ b/cores/flashrom-wb/flashrom_controller.vhd
@@ -12,7 +12,7 @@ entity flashrom_controller is
 
 		-- Control IF
 		ready             : out std_logic; -- The controller is ready to accept commands
-		page              : in  std_logic_vector(FLASHROM_ADDR_WIDTH - 1 downto 0);
+		page              : in  std_logic_vector(FLASHROM_PAGE_ADDR_WIDTH - 1 downto 0);
 		sync_stb          : in  std_logic; -- Synchronize current memory page with chip, only sampled when ready
 		load_stb          : in  std_logic; -- Load page into local buffer, only sampled when ready
 		status_update_stb : in  std_logic; -- Update status vector
@@ -28,7 +28,7 @@ entity flashrom_controller is
 		-- SPI flash hardware signals
 		spi_si            : out std_logic; -- SPI serial in
 		spi_so            : in  std_logic; -- SPI serial out
-		spi_sck           : out std_logic; -- Create clock using PLL, then supply to chip and this module
+		spi_sck           : out std_logic; -- SPI clock
 		spi_reset_n       : out std_logic; -- SPI hard reset
 		spi_cs_n          : out std_logic; -- SPI chip select
 		spi_wp_n          : out std_logic -- SPI write protect
diff --git a/cores/flashrom-wb/flashrom_pkg.vhd b/cores/flashrom-wb/flashrom_pkg.vhd
index 72a50da..ddc4578 100644
--- a/cores/flashrom-wb/flashrom_pkg.vhd
+++ b/cores/flashrom-wb/flashrom_pkg.vhd
@@ -3,12 +3,12 @@ use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;
 
 package flashrom_pkg is
-	constant FLASHROM_ADDR_WIDTH              : integer                      := 12;
+	constant FLASHROM_PAGE_ADDR_WIDTH         : integer                      := 12;
 	constant FLASHROM_COMMAND_MANUFACTURER_ID : std_logic_vector(7 downto 0) := x"9F";
 	constant FLASHROM_COMMAND_GET_STATUS      : std_logic_vector(7 downto 0) := x"D7";
 	constant FLASHROM_COMMAND_CONT_ARRAY_READ : std_logic_vector(7 downto 0) := x"0B";
 	constant FLASHROM_COMMAND_WRITE_THROUGH_1 : std_logic_vector(7 downto 0) := x"82";
-	
+
 	function padBits(target : std_logic_vector; other : std_logic_vector) return std_logic_vector;
 end package flashrom_pkg;
 
diff --git a/cores/flashrom-wb/flashrom_spi.vhd b/cores/flashrom-wb/flashrom_spi.vhd
index 7249ea0..7f01e1a 100644
--- a/cores/flashrom-wb/flashrom_spi.vhd
+++ b/cores/flashrom-wb/flashrom_spi.vhd
@@ -16,7 +16,7 @@ entity flashrom_spi is
 		-- SPI flash hardware signals
 		spi_si              : out std_logic; -- SPI serial in
 		spi_so              : in  std_logic; -- SPI serial out
-		spi_sck             : out std_logic; -- Create clock using PLL, then supply to chip and this module
+		spi_sck             : out std_logic; -- SPI clock
 		spi_cs_n            : out std_logic; -- SPI chip select
 
 		-- Logic interface