diff --git a/README.md b/README.md
index 435fed60..ee8ec8b7 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 C99 library implementation of AWS client-side authentication: standard credentials providers and signing.
 
+
 ## License
 
 This library is licensed under the Apache 2.0 License. 
diff --git a/include/aws/auth/auth.h b/include/aws/auth/auth.h
index 283fe47e..6181dc44 100644
--- a/include/aws/auth/auth.h
+++ b/include/aws/auth/auth.h
@@ -20,8 +20,10 @@
 
 #include <aws/io/logging.h>
 
+#define AWS_C_AUTH_PACKAGE_ID 6
+
 enum aws_auth_errors {
-    AWS_AUTH_PROFILE_PARSE_RECOVERABLE_ERROR = 0x1800,
+    AWS_AUTH_PROFILE_PARSE_RECOVERABLE_ERROR = AWS_ERROR_ENUM_BEGIN_RANGE(AWS_C_AUTH_PACKAGE_ID),
     AWS_AUTH_PROFILE_PARSE_FATAL_ERROR,
     AWS_AUTH_SIGNING_UNSUPPORTED_ALGORITHM,
     AWS_AUTH_SIGNING_MISMATCHED_CONFIGURATION,
@@ -30,16 +32,16 @@ enum aws_auth_errors {
     AWS_AUTH_SIGNING_ILLEGAL_REQUEST_HEADER,
     AWS_AUTH_SIGNING_INVALID_CONFIGURATION,
 
-    AWS_AUTH_ERROR_END_RANGE = 0x1BFF
+    AWS_AUTH_ERROR_END_RANGE = AWS_ERROR_ENUM_END_RANGE(AWS_C_AUTH_PACKAGE_ID)
 };
 
 enum aws_auth_log_subject {
-    AWS_LS_AUTH_GENERAL = 0x1800,
+    AWS_LS_AUTH_GENERAL = AWS_LOG_SUBJECT_BEGIN_RANGE(AWS_C_AUTH_PACKAGE_ID),
     AWS_LS_AUTH_PROFILE,
     AWS_LS_AUTH_CREDENTIALS_PROVIDER,
     AWS_LS_AUTH_SIGNING,
 
-    AWS_LS_AUTH_LAST = (AWS_LS_AUTH_GENERAL + AWS_LOG_SUBJECT_SPACE_SIZE - 1)
+    AWS_LS_AUTH_LAST = AWS_LOG_SUBJECT_END_RANGE(AWS_C_AUTH_PACKAGE_ID)
 };
 
 AWS_EXTERN_C_BEGIN