diff --git a/Makefile b/Makefile
index 9b5888af8..3483d358b 100644
--- a/Makefile
+++ b/Makefile
@@ -430,9 +430,9 @@ endef
 # first argument: a kernel set (name) being targeted (e.g. haswell).
 # second argument: the configuration whose CFLAGS we should use in compilation.
 # third argument: the kernel file suffix being considered.
-#$(BASE_OBJ_KERNELS_PATH)/$(1)/%.o: $(KERNELS_PATH)/$(1)/%.$(3) $(MK_HEADER_FILES) $(MAKE_DEFS_MK_PATHS)
+#$(BASE_OBJ_KERNELS_PATH)/$(1)/%.o: $(KERNELS_PATH)/$(1)/%.c $(BLIS_H_FLAT) $(MAKE_DEFS_MK_PATHS)
 define make-kernels-rule
-$(BASE_OBJ_KERNELS_PATH)/$(1)/%.o: $(KERNELS_PATH)/$(1)/%.c $(BLIS_H_FLAT) $(MAKE_DEFS_MK_PATHS)
+$(BASE_OBJ_KERNELS_PATH)/$(1)/%.o: $(KERNELS_PATH)/$(1)/%.$(3) $(BLIS_H_FLAT) $(MAKE_DEFS_MK_PATHS)
 ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
 	$(CC) $(call get-kernel-cflags-for,$(2)) -c $$< -o $$@
 else
@@ -468,7 +468,9 @@ $(foreach conf, $(CONFIG_LIST), $(eval $(call make-refkern-rule,$(conf))))
 # Instantiate the build rule for optimized kernels for each of the kernel
 # sets in KERNEL_LIST with the CFLAGS designated for the sub-configuration
 # specified by the KCONFIG_MAP.
-$(foreach kset, $(KERNEL_LIST), $(eval $(call make-kernels-rule,$(kset),$(call get-config-for-kset,$(kset)))))
+$(foreach kset, $(KERNEL_LIST), $(eval $(call make-kernels-rule,$(kset),$(call get-config-for-kset,$(kset)),c)))
+$(foreach kset, $(KERNEL_LIST), $(eval $(call make-kernels-rule,$(kset),$(call get-config-for-kset,$(kset)),s)))
+$(foreach kset, $(KERNEL_LIST), $(eval $(call make-kernels-rule,$(kset),$(call get-config-for-kset,$(kset)),S)))
 
 # FGVZ: for later, to compile multiple kernel source suffixes.
 #$(foreach suf,  $(KERNEL_SUFS), \
diff --git a/config/cortexa15/bli_cntx_init_cortexa15.c b/config/cortexa15/bli_cntx_init_cortexa15.c
index a3ac46272..a23358779 100644
--- a/config/cortexa15/bli_cntx_init_cortexa15.c
+++ b/config/cortexa15/bli_cntx_init_cortexa15.c
@@ -48,8 +48,8 @@ void bli_cntx_init_cortexa15( cntx_t* cntx )
 	bli_cntx_set_l3_nat_ukrs
 	(
 	  2,
-	  BLIS_GEMM_UKR, BLIS_FLOAT,    bli_sgemm_arm_int_4x4, FALSE,
-	  BLIS_GEMM_UKR, BLIS_DOUBLE,   bli_dgemm_arm_int_4x4, FALSE,
+	  BLIS_GEMM_UKR, BLIS_FLOAT,    bli_sgemm_armv7a_int_4x4, FALSE,
+	  BLIS_GEMM_UKR, BLIS_DOUBLE,   bli_dgemm_armv7a_int_4x4, FALSE,
 	  cntx
 	);
 
diff --git a/config/cortexa15/bli_family_cortexa15.h b/config/cortexa15/bli_family_cortexa15.h
index 44e0b947c..721dd327b 100644
--- a/config/cortexa15/bli_family_cortexa15.h
+++ b/config/cortexa15/bli_family_cortexa15.h
@@ -44,14 +44,14 @@
 #if 0
 // -- LEVEL-3 MICRO-KERNEL CONSTANTS -------------------------------------------
 
-#define BLIS_SGEMM_UKERNEL             bli_sgemm_opt_4x4
+#define BLIS_SGEMM_UKERNEL             bli_sgemm_armv7a_int_4x4
 #define BLIS_DEFAULT_MR_S              4
 #define BLIS_DEFAULT_NR_S              4
 #define BLIS_DEFAULT_MC_S              336 
 #define BLIS_DEFAULT_KC_S              528 
 #define BLIS_DEFAULT_NC_S              4096
 
-#define BLIS_DGEMM_UKERNEL             bli_dgemm_opt_4x4
+#define BLIS_DGEMM_UKERNEL             bli_dgemm_armv7a_int_4x4
 #define BLIS_DEFAULT_MR_D              4
 #define BLIS_DEFAULT_NR_D              4
 #define BLIS_DEFAULT_MC_D              176 
diff --git a/config/cortexa9/bli_cntx_init_cortexa9.c b/config/cortexa9/bli_cntx_init_cortexa9.c
index 8a94a1dcb..f37999cc0 100644
--- a/config/cortexa9/bli_cntx_init_cortexa9.c
+++ b/config/cortexa9/bli_cntx_init_cortexa9.c
@@ -48,8 +48,8 @@ void bli_cntx_init_cortexa9( cntx_t* cntx )
 	bli_cntx_set_l3_nat_ukrs
 	(
 	  2,
-	  BLIS_GEMM_UKR, BLIS_FLOAT,    bli_sgemm_arm_int_4x4, FALSE,
-	  BLIS_GEMM_UKR, BLIS_DOUBLE,   bli_dgemm_arm_int_4x4, FALSE,
+	  BLIS_GEMM_UKR, BLIS_FLOAT,    bli_sgemm_armv7a_int_4x4, FALSE,
+	  BLIS_GEMM_UKR, BLIS_DOUBLE,   bli_dgemm_armv7a_int_4x4, FALSE,
 	  cntx
 	);
 
diff --git a/config/cortexa9/bli_family_cortexa9.h b/config/cortexa9/bli_family_cortexa9.h
index 114fdee85..246fc0f4e 100644
--- a/config/cortexa9/bli_family_cortexa9.h
+++ b/config/cortexa9/bli_family_cortexa9.h
@@ -44,14 +44,14 @@
 #if 0
 // -- LEVEL-3 MICRO-KERNEL CONSTANTS -------------------------------------------
 
-#define BLIS_SGEMM_UKERNEL             bli_sgemm_opt_4x4
+#define BLIS_SGEMM_UKERNEL             bli_sgemm_armv7a_int_4x4
 #define BLIS_DEFAULT_MR_S              4
 #define BLIS_DEFAULT_NR_S              4
 #define BLIS_DEFAULT_MC_S              432
 #define BLIS_DEFAULT_KC_S              352
 #define BLIS_DEFAULT_NC_S              4096
 
-#define BLIS_DGEMM_UKERNEL             bli_dgemm_opt_4x4
+#define BLIS_DGEMM_UKERNEL             bli_dgemm_armv7a_int_4x4
 #define BLIS_DEFAULT_MR_D              4
 #define BLIS_DEFAULT_NR_D              4
 #define BLIS_DEFAULT_MC_D              176
diff --git a/config/cortexa9/make_defs.mk b/config/cortexa9/make_defs.mk
index 684879da4..7aa8d0ce6 100644
--- a/config/cortexa9/make_defs.mk
+++ b/config/cortexa9/make_defs.mk
@@ -67,7 +67,7 @@ endif
 
 CKOPTFLAGS     := $(COPTFLAGS)
 
-ifneq ($(CC_VENDOR),gcc)
+ifeq ($(CC_VENDOR),gcc)
 CVECFLAGS      := -march=armv7-a
 else
 $(error gcc is required for this configuration.)