diff --git a/LAPACKE/src/lapacke_ctfsm.c b/LAPACKE/src/lapacke_ctfsm.c
index 1d50a5970..fc75890bd 100644
--- a/LAPACKE/src/lapacke_ctfsm.c
+++ b/LAPACKE/src/lapacke_ctfsm.c
@@ -45,7 +45,7 @@ lapack_int API_SUFFIX(LAPACKE_ctfsm)( int matrix_layout, char transr, char side,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         lapack_int mn = m;
-        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
+        if( LAPACKE_lsame( side, 'r' ) ) mn = n;
         /* Optionally check input matrices for NaNs */
         if( IS_C_NONZERO(alpha) ) {
             if( API_SUFFIX(LAPACKE_ctf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {
diff --git a/LAPACKE/src/lapacke_ctfsm_work.c b/LAPACKE/src/lapacke_ctfsm_work.c
index 1916df9d5..50f123579 100644
--- a/LAPACKE/src/lapacke_ctfsm_work.c
+++ b/LAPACKE/src/lapacke_ctfsm_work.c
@@ -51,7 +51,7 @@ lapack_int API_SUFFIX(LAPACKE_ctfsm_work)( int matrix_layout, char transr, char
         lapack_int mn = m;
         lapack_complex_float* b_t = NULL;
         lapack_complex_float* a_t = NULL;
-        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
+        if( LAPACKE_lsame( side, 'r' ) ) mn = n;
         /* Check leading dimension(s) */
         if( ldb < m ) {
             info = -12;
diff --git a/LAPACKE/src/lapacke_dtfsm.c b/LAPACKE/src/lapacke_dtfsm.c
index 964d50081..c0a33f318 100644
--- a/LAPACKE/src/lapacke_dtfsm.c
+++ b/LAPACKE/src/lapacke_dtfsm.c
@@ -45,7 +45,7 @@ lapack_int API_SUFFIX(LAPACKE_dtfsm)( int matrix_layout, char transr, char side,
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
         lapack_int mn = m;
-        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
+        if( LAPACKE_lsame( side, 'r' ) ) mn = n;
         if( IS_D_NONZERO(alpha) ) {
             if( API_SUFFIX(LAPACKE_dtf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {
                 return -10;
diff --git a/LAPACKE/src/lapacke_dtfsm_work.c b/LAPACKE/src/lapacke_dtfsm_work.c
index 30396d6ed..938de2f96 100644
--- a/LAPACKE/src/lapacke_dtfsm_work.c
+++ b/LAPACKE/src/lapacke_dtfsm_work.c
@@ -50,7 +50,7 @@ lapack_int API_SUFFIX(LAPACKE_dtfsm_work)( int matrix_layout, char transr, char
         lapack_int mn = m;
         double* b_t = NULL;
         double* a_t = NULL;
-        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
+        if( LAPACKE_lsame( side, 'r' ) ) mn = n;
         /* Check leading dimension(s) */
         if( ldb < m ) {
             info = -12;
diff --git a/LAPACKE/src/lapacke_stfsm.c b/LAPACKE/src/lapacke_stfsm.c
index 55f0b1a2e..23c8730c8 100644
--- a/LAPACKE/src/lapacke_stfsm.c
+++ b/LAPACKE/src/lapacke_stfsm.c
@@ -44,7 +44,7 @@ lapack_int API_SUFFIX(LAPACKE_stfsm)( int matrix_layout, char transr, char side,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         lapack_int mn = m;
-        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
+        if( LAPACKE_lsame( side, 'r' ) ) mn = n;
         /* Optionally check input matrices for NaNs */
         if( IS_S_NONZERO(alpha) ) {
             if( API_SUFFIX(LAPACKE_stf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {
diff --git a/LAPACKE/src/lapacke_stfsm_work.c b/LAPACKE/src/lapacke_stfsm_work.c
index 8d828c082..c601472d6 100644
--- a/LAPACKE/src/lapacke_stfsm_work.c
+++ b/LAPACKE/src/lapacke_stfsm_work.c
@@ -50,7 +50,7 @@ lapack_int API_SUFFIX(LAPACKE_stfsm_work)( int matrix_layout, char transr, char
         lapack_int mn = MAX(1,m);
         float* b_t = NULL;
         float* a_t = NULL;
-        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
+        if( LAPACKE_lsame( side, 'r' ) ) mn = n;
         /* Check leading dimension(s) */
         if( ldb < m ) {
             info = -12;
diff --git a/LAPACKE/src/lapacke_ztfsm.c b/LAPACKE/src/lapacke_ztfsm.c
index bde4b044b..43ea9aabe 100644
--- a/LAPACKE/src/lapacke_ztfsm.c
+++ b/LAPACKE/src/lapacke_ztfsm.c
@@ -45,7 +45,7 @@ lapack_int API_SUFFIX(LAPACKE_ztfsm)( int matrix_layout, char transr, char side,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         lapack_int mn = m;
-        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
+        if( LAPACKE_lsame( side, 'r' ) ) mn = n;
         /* Optionally check input matrices for NaNs */
         if( IS_Z_NONZERO(alpha) ) {
             if( API_SUFFIX(LAPACKE_ztf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {
diff --git a/LAPACKE/src/lapacke_ztfsm_work.c b/LAPACKE/src/lapacke_ztfsm_work.c
index d1d139f02..11e269598 100644
--- a/LAPACKE/src/lapacke_ztfsm_work.c
+++ b/LAPACKE/src/lapacke_ztfsm_work.c
@@ -51,7 +51,7 @@ lapack_int API_SUFFIX(LAPACKE_ztfsm_work)( int matrix_layout, char transr, char
         lapack_int mn = m;
         lapack_complex_double* b_t = NULL;
         lapack_complex_double* a_t = NULL;
-        if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
+        if( LAPACKE_lsame( side, 'r' ) ) mn = n;
         /* Check leading dimension(s) */
         if( ldb < m ) {
             info = -12;
@@ -86,7 +86,7 @@ lapack_int API_SUFFIX(LAPACKE_ztfsm_work)( int matrix_layout, char transr, char
                       b_t, &ldb_t );
         info = 0;  /* LAPACK call is ok! */
         /* Transpose output matrices */
-        API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
+        LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
         /* Release memory and exit */
         if( IS_Z_NONZERO(alpha) ) {
             LAPACKE_free( a_t );