diff --git a/Source/Source.API.php b/Source/Source.API.php
index 586e796..3c1d7a2 100644
--- a/Source/Source.API.php
+++ b/Source/Source.API.php
@@ -50,7 +50,7 @@
  * @return boolean Integration enabled
  */
 function Source_PVM( $p_trigger_error=true ) {
-	if ( config_get( 'plugin_Source_enable_product_matrix' ) ) {
+	if ( plugin_config_get( 'enable_product_matrix' ) ) {
 		if ( plugin_is_loaded( 'ProductMatrix' ) || !$p_trigger_error ) {
 			return true;
 		} else {
@@ -73,8 +73,8 @@
 	$t_bugs = array();
 
 	if ( is_null( $s_regex1 ) ) {
-		$s_regex1 = config_get( 'plugin_Source_buglink_regex_1' );
-		$s_regex2 = config_get( 'plugin_Source_buglink_regex_2' );
+		$s_regex1 = plugin_config_get( 'buglink_regex_1' );
+		$s_regex2 = plugin_config_get( 'buglink_regex_2' );
 	}
 
 	preg_match_all( $s_regex1, $p_string, $t_matches_all );
@@ -103,8 +103,8 @@
 	$t_bugs = array();
 
 	if ( is_null( $s_regex1 ) ) {
-		$s_regex1 = config_get( 'plugin_Source_bugfix_regex_1' );
-		$s_regex2 = config_get( 'plugin_Source_bugfix_regex_2' );
+		$s_regex1 = plugin_config_get( 'bugfix_regex_1' );
+		$s_regex2 = plugin_config_get( 'bugfix_regex_2' );
 	}
 
 	preg_match_all( $s_regex1, $p_string, $t_matches_all );
@@ -265,18 +265,18 @@
 	bug_cache_array_rows( array_keys( $t_fixed_bugs ) );
 
 	$t_current_user_id = $g_cache_current_user_id;
-	$t_enable_resolving = config_get( 'plugin_Source_enable_resolving' );
-	$t_enable_message = config_get( 'plugin_Source_enable_message' );
-	$t_enable_mapping = config_get( 'plugin_Source_enable_mapping' );
+	$t_enable_resolving = plugin_config_get( 'enable_resolving' );
+	$t_enable_message = plugin_config_get( 'enable_message' );
+	$t_enable_mapping = plugin_config_get( 'enable_mapping' );
 
-	$t_bugfix_status = config_get( 'plugin_Source_bugfix_status' );
-	$t_bugfix_status_pvm = config_get( 'plugin_Source_bugfix_status_pvm' );
-	$t_resolution = config_get( 'plugin_Source_bugfix_resolution' );
-	$t_handler = config_get( 'plugin_Source_bugfix_handler' );
+	$t_bugfix_status = plugin_config_get( 'bugfix_status' );
+	$t_bugfix_status_pvm = plugin_config_get( 'bugfix_status_pvm' );
+	$t_resolution = plugin_config_get( 'bugfix_resolution' );
+	$t_handler = plugin_config_get( 'bugfix_handler' );
 	$t_message_template = str_replace(
 		array( '$1', '$2', '$3', '$4', '$5', '$6' ),
 		array( '%1$s', '%2$s', '%3$s', '%4$s', '%5$s', '%6$s' ),
-		config_get( 'plugin_Source_bugfix_message' ) );
+		plugin_config_get( 'bugfix_message' ) );
 
 	$t_mappings = array();
 
diff --git a/Source/Source.ViewAPI.php b/Source/Source.ViewAPI.php
index 5aaafcd..78e6d7f 100644
--- a/Source/Source.ViewAPI.php
+++ b/Source/Source.ViewAPI.php
@@ -20,7 +20,7 @@
 		$t_repos = $p_repos;
 	}
 
-	$t_use_porting = config_get( 'plugin_Source_enable_porting' );
+	$t_use_porting = plugin_config_get( 'enable_porting' );
 
 	foreach( $p_changesets as $t_changeset ) {
 		$t_repo = $t_repos[ $t_changeset->repo_id ];
diff --git a/Source/SourceIntegration.php b/Source/SourceIntegration.php
index 587a900..08eb24f 100644
--- a/Source/SourceIntegration.php
+++ b/Source/SourceIntegration.php
@@ -33,7 +33,7 @@
 	function display_bug( $p_event, $p_bug_id ) {
 		require_once( 'Source.ViewAPI.php' );
 
-		if ( !access_has_global_level( config_get( 'plugin_Source_view_threshold' ) ) ) {
+		if ( !access_has_global_level( plugin_config_get( 'view_threshold' ) ) ) {
 			return;
 		}
 
@@ -85,7 +85,7 @@
 	 * @param int User ID
 	 */
 	function account_update_form( $p_event, $p_user_id ) {
-		if ( !access_has_global_level( config_get( 'plugin_Source_username_threshold' ) ) ) {
+		if ( !access_has_global_level( plugin_config_get( 'username_threshold' ) ) ) {
 			return;
 		}
 
@@ -103,7 +103,7 @@
 	 * @param int User ID
 	 */
 	function account_update( $p_event, $p_user_id ) {
-		if ( !access_has_global_level( config_get( 'plugin_Source_username_threshold' ) ) ) {
+		if ( !access_has_global_level( plugin_config_get( 'username_threshold' ) ) ) {
 			return;
 		}