diff --git a/bp-compliments-core.php b/bp-compliments-core.php
index a63c465..5cf1e2b 100644
--- a/bp-compliments-core.php
+++ b/bp-compliments-core.php
@@ -41,7 +41,7 @@ public function __construct() {
 
         parent::start(
             'compliments',
-            __( 'Compliments', BP_COMP_TEXTDOMAIN ),
+            __( 'Compliments', 'bp-compliments' ),
             constant( 'BP_COMPLIMENTS_DIR' ) . '/includes',
             $this->params
         );
diff --git a/bp-compliments.php b/bp-compliments.php
index 9cc8da9..8d066c0 100644
--- a/bp-compliments.php
+++ b/bp-compliments.php
@@ -10,7 +10,7 @@
 Plugin Name: BuddyPress Compliments
 Plugin URI: http://wpgeodirectory.com/
 Description: Compliments module for BuddyPress.
-Version: 0.0.7
+Version: 0.0.8
 Author: GeoDirectory
 Author URI: http://wpgeodirectory.com
 */
@@ -19,7 +19,7 @@
 if ( !defined( 'ABSPATH' ) ) exit;
 
 // Define the plugin version.
-define( 'BP_COMPLIMENTS_VER', '0.0.7' );
+define( 'BP_COMPLIMENTS_VER', '0.0.8' );
 
 /**
  * BuddyPress compliments text domain.
@@ -28,9 +28,9 @@
 /**
  * BuddyPress compliments names.
  */
-define( 'BP_COMP_SINGULAR_NAME', trim(esc_attr( get_option('bp_compliment_singular_name', __( 'Compliment', BP_COMP_TEXTDOMAIN )))) );
-define( 'BP_COMP_PLURAL_NAME', trim(esc_attr( get_option('bp_compliment_plural_name', __( 'Compliments', BP_COMP_TEXTDOMAIN )))) );
-define( 'BP_COMPLIMENTS_SLUG', strtolower(trim(esc_attr( get_option('bp_compliment_slug', __( 'compliments', BP_COMP_TEXTDOMAIN ))))) );
+define( 'BP_COMP_SINGULAR_NAME', trim(esc_attr( get_option('bp_compliment_singular_name', __( 'Compliment', 'bp-compliments' )))) );
+define( 'BP_COMP_PLURAL_NAME', trim(esc_attr( get_option('bp_compliment_plural_name', __( 'Compliments', 'bp-compliments' )))) );
+define( 'BP_COMPLIMENTS_SLUG', strtolower(trim(esc_attr( get_option('bp_compliment_slug', __( 'compliments', 'bp-compliments' ))))) );
 
 
 /**
@@ -68,7 +68,7 @@ function bp_compliments_init() {
 
     // show admin notice for users on BP 1.2.x
     } else {
-        $older_version_notice = __( "Hey! BP Compliments requires BuddyPress 1.5 or higher.", BP_COMP_TEXTDOMAIN );
+        $older_version_notice = __( "Hey! BP Compliments requires BuddyPress 1.5 or higher.", 'bp-compliments' );
 
         add_action( 'admin_notices', create_function( '', "
 			echo '<div class=\"error\"><p>' . $older_version_notice . '</p></div>';
@@ -136,10 +136,10 @@ function bp_compliments_localization() {
      * @since 0.0.1
      * @package BuddyPress_Compliments
      */
-    $locale = apply_filters('plugin_locale', get_locale(), BP_COMP_TEXTDOMAIN);
+    $locale = apply_filters('plugin_locale', get_locale(), 'bp-compliments');
 
-    load_textdomain(BP_COMP_TEXTDOMAIN, WP_LANG_DIR . '/' . BP_COMP_TEXTDOMAIN . '/' . BP_COMP_TEXTDOMAIN . '-' . $locale . '.mo');
-    load_plugin_textdomain(BP_COMP_TEXTDOMAIN, false, dirname( plugin_basename( __FILE__ ) ) . '/languages');
+    load_textdomain('bp-compliments', WP_LANG_DIR . '/' . 'bp-compliments' . '/' . 'bp-compliments' . '-' . $locale . '.mo');
+    load_plugin_textdomain('bp-compliments', false, dirname( plugin_basename( __FILE__ ) ) . '/languages');
 
 }
 add_action( 'plugins_loaded', 'bp_compliments_localization' );
diff --git a/change_log.txt b/change_log.txt
index fb12f8c..8f6c6c2 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -4,6 +4,7 @@ Option added to enable/disable notifications component - ADDED
 Added placeholder text to message textarea - ADDED
 Compliments in activity dropdown filter is ambiguous - FIXED
 Undefined property ID notice - FIXED
+Changed textdomain from defined constant to a string - CHANGED
 
 v0.0.7
 Compliments can be renamed to anything Ex: "Gifts" - ADDED
diff --git a/includes/bp-compliments-actions.php b/includes/bp-compliments-actions.php
index 04cdfbc..ca3e1bf 100644
--- a/includes/bp-compliments-actions.php
+++ b/includes/bp-compliments-actions.php
@@ -48,9 +48,9 @@ function handle_compliments_form_data() {
         $redirect_url = bp_core_get_user_domain($receiver_id);
 
         if ( ! bp_compliments_start_compliment($args)) {
-            bp_core_add_message( sprintf( __( 'There was a problem when trying to send %s to %s, please contact administrator.', BP_COMP_TEXTDOMAIN ), strtolower(BP_COMP_SINGULAR_NAME), $receiver_name ), 'error' );
+            bp_core_add_message( sprintf( __( 'There was a problem when trying to send %s to %s, please contact administrator.', 'bp-compliments' ), strtolower(BP_COMP_SINGULAR_NAME), $receiver_name ), 'error' );
         } else {
-            bp_core_add_message( sprintf( __( 'Your %s sent to %s.', BP_COMP_TEXTDOMAIN ), strtolower(BP_COMP_SINGULAR_NAME), $receiver_name ) );
+            bp_core_add_message( sprintf( __( 'Your %s sent to %s.', 'bp-compliments' ), strtolower(BP_COMP_SINGULAR_NAME), $receiver_name ) );
         }
 
 	    $bp_compliment_can_see_others_comp_value = esc_attr( get_option('bp_compliment_can_see_others_comp'));
diff --git a/includes/bp-compliments-activity.php b/includes/bp-compliments-activity.php
index f8e0f6e..a1e6543 100644
--- a/includes/bp-compliments-activity.php
+++ b/includes/bp-compliments-activity.php
@@ -103,7 +103,7 @@ function compliments_register_activity_actions() {
     bp_activity_set_action(
         $bp->compliments->id,
         'compliment_received',
-        sprintf( __( '%s Received', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
+        sprintf( __( '%s Received', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
         'compliments_format_activity_action_compliment_received',
         BP_COMP_PLURAL_NAME,
         array( 'activity' )
@@ -112,7 +112,7 @@ function compliments_register_activity_actions() {
     bp_activity_set_action(
         $bp->compliments->id,
         'compliment_sent',
-        sprintf( __( '%s Sent', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
+        sprintf( __( '%s Sent', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
         'compliments_format_activity_action_compliment_sent',
         BP_COMP_PLURAL_NAME,
         array( 'activity' )
@@ -155,9 +155,9 @@ function compliments_format_activity_action_compliment_received( $action, $activ
     }
 
     if ($bp_compliment_can_see_others_comp == 'yes') {
-        $action = sprintf( __( '%1$s has received a %2$s from %3$s', BP_COMP_TEXTDOMAIN ), $receiver_link, $compliment_link, $sender_link );
+        $action = sprintf( __( '%1$s has received a %2$s from %3$s', 'bp-compliments' ), $receiver_link, $compliment_link, $sender_link );
     } else {
-        $action = sprintf( __( '%1$s has received a %2$s from %3$s', BP_COMP_TEXTDOMAIN ), $receiver_link, strtolower(BP_COMP_SINGULAR_NAME),  $sender_link );
+        $action = sprintf( __( '%1$s has received a %2$s from %3$s', 'bp-compliments' ), $receiver_link, strtolower(BP_COMP_SINGULAR_NAME),  $sender_link );
     }
 
 
@@ -199,9 +199,9 @@ function compliments_format_activity_action_compliment_sent( $action, $activity
     }
 
     if ($bp_compliment_can_see_others_comp == 'yes') {
-        $action = sprintf( __( '%1$s has sent a %2$s to %3$s', BP_COMP_TEXTDOMAIN ), $sender_link, $compliment_link, $receiver_link );
+        $action = sprintf( __( '%1$s has sent a %2$s to %3$s', 'bp-compliments' ), $sender_link, $compliment_link, $receiver_link );
     } else {
-        $action = sprintf( __( '%1$s has sent a %2$s to %3$s', BP_COMP_TEXTDOMAIN ), $sender_link, strtolower(BP_COMP_SINGULAR_NAME), $receiver_link );
+        $action = sprintf( __( '%1$s has sent a %2$s to %3$s', 'bp-compliments' ), $sender_link, strtolower(BP_COMP_SINGULAR_NAME), $receiver_link );
     }
 
     /**
diff --git a/includes/bp-compliments-forms.php b/includes/bp-compliments-forms.php
index 2a2b271..d7ee9e7 100644
--- a/includes/bp-compliments-forms.php
+++ b/includes/bp-compliments-forms.php
@@ -23,7 +23,7 @@ function bp_compliments_modal_form($pid = 0, $receiver_id = 0) {
     <div class="comp-modal">
         <div class="comp-modal-content-wrap">
             <div class="comp-modal-title">
-                <h2><?php echo sprintf( __( 'Choose Your %s Type:', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ); ?></h2>
+                <h2><?php echo sprintf( __( 'Choose Your %s Type:', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ); ?></h2>
             </div>
             <div class="comp-modal-content">
                 <form action="" method="post">
@@ -55,13 +55,13 @@ function bp_compliments_modal_form($pid = 0, $receiver_id = 0) {
                         echo '</ul>';
 
                         ?>
-                        <textarea placeholder="<?php echo __( 'Type your message here', BP_COMP_TEXTDOMAIN ); ?>" name="message" maxchar="1000"></textarea>
+                        <textarea placeholder="<?php echo __( 'Type your message here', 'bp-compliments' ); ?>" name="message" maxchar="1000"></textarea>
                         <input type="hidden" name="post_id" value="<?php echo $pid; ?>"/>
                         <input type="hidden" name="receiver_id" value="<?php echo $receiver_id; ?>"/>
                         <?php wp_nonce_field( 'handle_compliments_form_data','handle_compliments_nonce' ); ?>
                         <div class="bp-comp-pop-buttons">
-                            <button type="submit" class="comp-submit-btn" name="comp-modal-form" value="submit"><?php echo __( 'Send', BP_COMP_TEXTDOMAIN ); ?></button>
-                            <a class="bp-comp-cancel" href="#"><?php echo __( 'Cancel', BP_COMP_TEXTDOMAIN ); ?></a>
+                            <button type="submit" class="comp-submit-btn" name="comp-modal-form" value="submit"><?php echo __( 'Send', 'bp-compliments' ); ?></button>
+                            <a class="bp-comp-cancel" href="#"><?php echo __( 'Cancel', 'bp-compliments' ); ?></a>
                         </div>
                         <script type="text/javascript">
                             jQuery(document).ready(function() {
diff --git a/includes/bp-compliments-notifications.php b/includes/bp-compliments-notifications.php
index 7454492..036db5c 100644
--- a/includes/bp-compliments-notifications.php
+++ b/includes/bp-compliments-notifications.php
@@ -46,7 +46,7 @@ function bp_compliments_format_notifications( $action, $item_id, $secondary_item
             $text = false;
 
             if ( 1 == $total_items ) {
-                $text = sprintf( __( '%s has sent you a %s', BP_COMP_TEXTDOMAIN ), bp_core_get_user_displayname( $item_id ), strtolower(BP_COMP_SINGULAR_NAME) );
+                $text = sprintf( __( '%s has sent you a %s', 'bp-compliments' ), bp_core_get_user_displayname( $item_id ), strtolower(BP_COMP_SINGULAR_NAME) );
                 $link = bp_core_get_user_domain( $bp->loggedin_user->id ) .BP_COMPLIMENTS_SLUG. '/?bpc_read=true&bpc_sender_id='.$item_id;
             }
             break;
@@ -182,12 +182,12 @@ function bp_compliments_new_compliment_email_notification() {
     // Set up and send the message
     $to = $receiver_ud->user_email;
 
-    $subject = '[' . wp_specialchars_decode( bp_get_option( 'blogname' ), ENT_QUOTES ) . '] ' . sprintf( __( '%s has sent you a %s',  BP_COMP_TEXTDOMAIN ), $sender_name, strtolower(BP_COMP_SINGULAR_NAME) );
+    $subject = '[' . wp_specialchars_decode( bp_get_option( 'blogname' ), ENT_QUOTES ) . '] ' . sprintf( __( '%s has sent you a %s',  'bp-compliments' ), $sender_name, strtolower(BP_COMP_SINGULAR_NAME) );
 
     $message = sprintf( __(
         '%s has sent you a %s.
 
-To view %s\'s %s: %s', BP_COMP_TEXTDOMAIN ), $sender_name, strtolower(BP_COMP_SINGULAR_NAME), $sender_name, strtolower(BP_COMP_SINGULAR_NAME), $compliment_link );
+To view %s\'s %s: %s', 'bp-compliments' ), $sender_name, strtolower(BP_COMP_SINGULAR_NAME), $sender_name, strtolower(BP_COMP_SINGULAR_NAME), $compliment_link );
 
     // Add notifications link if settings component is enabled
     if ( bp_is_active( 'settings' ) ) {
@@ -196,7 +196,7 @@ function bp_compliments_new_compliment_email_notification() {
 
 ---------------------
 To disable these notifications please log in and go to:
-%s', BP_COMP_TEXTDOMAIN ), $settings_link );
+%s', 'bp-compliments' ), $settings_link );
     }
 
     // Send the message
@@ -275,15 +275,15 @@ function bp_compliments_screen_notification_settings() {
         <tr>
             <th class="icon"></th>
             <th class="title"><?php echo BP_COMP_PLURAL_NAME; ?></th>
-            <th class="yes"><?php _e( 'Yes', BP_COMP_TEXTDOMAIN ) ?></th>
-            <th class="no"><?php _e( 'No', BP_COMP_TEXTDOMAIN )?></th>
+            <th class="yes"><?php _e( 'Yes', 'bp-compliments' ) ?></th>
+            <th class="no"><?php _e( 'No', 'bp-compliments' )?></th>
         </tr>
         </thead>
 
         <tbody>
         <tr>
             <td></td>
-            <td><?php echo sprintf( __( 'A member sends you a %s', BP_COMP_TEXTDOMAIN ), strtolower(BP_COMP_SINGULAR_NAME)); ?></td>
+            <td><?php echo sprintf( __( 'A member sends you a %s', 'bp-compliments' ), strtolower(BP_COMP_SINGULAR_NAME)); ?></td>
             <td class="yes"><input type="radio" name="notifications[notification_on_compliments]" value="yes" <?php checked( $notify, 'yes', true ) ?>/></td>
             <td class="no"><input type="radio" name="notifications[notification_on_compliments]" value="no" <?php checked( $notify, 'no', true ) ?>/></td>
         </tr>
diff --git a/includes/bp-compliments-settings.php b/includes/bp-compliments-settings.php
index 1adc1d3..326e756 100644
--- a/includes/bp-compliments-settings.php
+++ b/includes/bp-compliments-settings.php
@@ -35,7 +35,7 @@ function bp_compliments_register_settings() {
 function bp_compliments_settings_page() {
 	?>
 	<div class="wrap">
-		<h2><?php echo sprintf( __( 'BuddyPress %s - Settings', BP_COMP_TEXTDOMAIN ), BP_COMP_PLURAL_NAME ); ?></h2>
+		<h2><?php echo sprintf( __( 'BuddyPress %s - Settings', 'bp-compliments' ), BP_COMP_PLURAL_NAME ); ?></h2>
 		<form method="post" action="options.php">
 			<?php settings_fields( 'bp-compliment-settings' ); ?>
 			<?php do_settings_sections( 'bp-compliment-settings' );
@@ -60,59 +60,59 @@ function bp_compliments_settings_page() {
 			?>
 			<table class="widefat fixed" style="padding:10px;margin-top: 10px;">
 				<tr valign="top">
-					<th scope="row"><?php echo __( 'Singlular name ( e.g. Gift. Default: Compliment )', BP_COMP_TEXTDOMAIN ); ?></th>
+					<th scope="row"><?php echo __( 'Singlular name ( e.g. Gift. Default: Compliment )', 'bp-compliments' ); ?></th>
 					<td><input type="text" class="widefat" name="bp_compliment_singular_name" value="<?php echo BP_COMP_SINGULAR_NAME; ?>" /></td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php echo __( 'Plural name ( e.g. Gifts. Default: Compliments )', BP_COMP_TEXTDOMAIN ); ?></th>
+					<th scope="row"><?php echo __( 'Plural name ( e.g. Gifts. Default: Compliments )', 'bp-compliments' ); ?></th>
 					<td><input type="text" class="widefat" name="bp_compliment_plural_name" value="<?php echo BP_COMP_PLURAL_NAME; ?>" /></td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php echo __( 'Slug ( e.g. gifts. Default: compliments. must be lowercase )', BP_COMP_TEXTDOMAIN ); ?></th>
+					<th scope="row"><?php echo __( 'Slug ( e.g. gifts. Default: compliments. must be lowercase )', 'bp-compliments' ); ?></th>
 					<td><input type="text" class="widefat" name="bp_compliment_slug" value="<?php echo BP_COMPLIMENTS_SLUG; ?>" /></td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php echo sprintf( __( 'Members can see other members %s page?', BP_COMP_TEXTDOMAIN ), strtolower(BP_COMP_SINGULAR_NAME) ); ?></th>
+					<th scope="row"><?php echo sprintf( __( 'Members can see other members %s page?', 'bp-compliments' ), strtolower(BP_COMP_SINGULAR_NAME) ); ?></th>
 					<td>
 						<select id="bp_compliment_can_see_others_comp" name="bp_compliment_can_see_others_comp">
-							<option value="yes" <?php selected( $bp_compliment_can_see_others_comp, 'yes' ); ?>><?php echo __( 'Yes', BP_COMP_TEXTDOMAIN ); ?></option>
-							<option value="no" <?php selected( $bp_compliment_can_see_others_comp, 'no' ); ?>><?php echo __( 'No', BP_COMP_TEXTDOMAIN ); ?></option>
+							<option value="yes" <?php selected( $bp_compliment_can_see_others_comp, 'yes' ); ?>><?php echo __( 'Yes', 'bp-compliments' ); ?></option>
+							<option value="no" <?php selected( $bp_compliment_can_see_others_comp, 'no' ); ?>><?php echo __( 'No', 'bp-compliments' ); ?></option>
 						</select>
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php echo sprintf( __( 'Members can delete %s received?', BP_COMP_TEXTDOMAIN ), strtolower(BP_COMP_PLURAL_NAME) ); ?></th>
+					<th scope="row"><?php echo sprintf( __( 'Members can delete %s received?', 'bp-compliments' ), strtolower(BP_COMP_PLURAL_NAME) ); ?></th>
 					<td>
 						<select id="bp_compliment_can_delete" name="bp_compliment_can_delete">
-							<option value="yes" <?php selected( $bp_compliment_can_delete, 'yes' ); ?>><?php echo __( 'Yes', BP_COMP_TEXTDOMAIN ); ?></option>
-							<option value="no" <?php selected( $bp_compliment_can_delete, 'no' ); ?>><?php echo __( 'No', BP_COMP_TEXTDOMAIN ); ?></option>
+							<option value="yes" <?php selected( $bp_compliment_can_delete, 'yes' ); ?>><?php echo __( 'Yes', 'bp-compliments' ); ?></option>
+							<option value="no" <?php selected( $bp_compliment_can_delete, 'no' ); ?>><?php echo __( 'No', 'bp-compliments' ); ?></option>
 						</select>
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php echo sprintf( __( 'Enable activity component for %s ?', BP_COMP_TEXTDOMAIN ), strtolower(BP_COMP_PLURAL_NAME) ); ?></th>
+					<th scope="row"><?php echo sprintf( __( 'Enable activity component for %s ?', 'bp-compliments' ), strtolower(BP_COMP_PLURAL_NAME) ); ?></th>
 					<td>
 						<select id="bp_compliment_enable_activity" name="bp_compliment_enable_activity">
-							<option value="yes" <?php selected( $bp_compliment_enable_activity, 'yes' ); ?>><?php echo __( 'Yes', BP_COMP_TEXTDOMAIN ); ?></option>
-							<option value="no" <?php selected( $bp_compliment_enable_activity, 'no' ); ?>><?php echo __( 'No', BP_COMP_TEXTDOMAIN ); ?></option>
+							<option value="yes" <?php selected( $bp_compliment_enable_activity, 'yes' ); ?>><?php echo __( 'Yes', 'bp-compliments' ); ?></option>
+							<option value="no" <?php selected( $bp_compliment_enable_activity, 'no' ); ?>><?php echo __( 'No', 'bp-compliments' ); ?></option>
 						</select>
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php echo sprintf( __( 'Enable notification component for %s ?', BP_COMP_TEXTDOMAIN ), strtolower(BP_COMP_PLURAL_NAME) ); ?></th>
+					<th scope="row"><?php echo sprintf( __( 'Enable notification component for %s ?', 'bp-compliments' ), strtolower(BP_COMP_PLURAL_NAME) ); ?></th>
 					<td>
 						<select id="bp_compliment_enable_notifications" name="bp_compliment_enable_notifications">
-							<option value="yes" <?php selected( $bp_compliment_enable_notifications, 'yes' ); ?>><?php echo __( 'Yes', BP_COMP_TEXTDOMAIN ); ?></option>
-							<option value="no" <?php selected( $bp_compliment_enable_notifications, 'no' ); ?>><?php echo __( 'No', BP_COMP_TEXTDOMAIN ); ?></option>
+							<option value="yes" <?php selected( $bp_compliment_enable_notifications, 'yes' ); ?>><?php echo __( 'Yes', 'bp-compliments' ); ?></option>
+							<option value="no" <?php selected( $bp_compliment_enable_notifications, 'no' ); ?>><?php echo __( 'No', 'bp-compliments' ); ?></option>
 						</select>
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php echo sprintf( __( 'Number of %s to display per page?', BP_COMP_TEXTDOMAIN ), BP_COMP_PLURAL_NAME ); ?></th>
+					<th scope="row"><?php echo sprintf( __( 'Number of %s to display per page?', 'bp-compliments' ), BP_COMP_PLURAL_NAME ); ?></th>
 					<td><input type="number" class="widefat" name="bp_comp_per_page" value="<?php echo $comp_per_page; ?>" /></td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php echo __( 'Custom CSS styles', BP_COMP_TEXTDOMAIN ); ?></th>
+					<th scope="row"><?php echo __( 'Custom CSS styles', 'bp-compliments' ); ?></th>
 					<td><textarea class="widefat" rows="5" name="bp_comp_custom_css"><?php echo $comp_custom_css; ?></textarea></td>
 				</tr>
 				<tr valign="top">
diff --git a/includes/bp-compliments-taxonomies.php b/includes/bp-compliments-taxonomies.php
index 145fbaf..1f9e8f5 100644
--- a/includes/bp-compliments-taxonomies.php
+++ b/includes/bp-compliments-taxonomies.php
@@ -17,8 +17,8 @@
 function register_compliments_submenu_page() {
     add_submenu_page(
         'bp-compliment-settings',
-        sprintf( __( '%s Types', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
-        sprintf( __( '%s Types', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
+        sprintf( __( '%s Types', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
+        sprintf( __( '%s Types', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
         'manage_options',
         'edit-tags.php?taxonomy=compliment'
     );
@@ -37,14 +37,14 @@ function create_compliment_taxonomies() {
     $labels = array(
         'name'              => BP_COMP_PLURAL_NAME,
         'singular_name'     => BP_COMP_SINGULAR_NAME,
-        'search_items'      => sprintf( __( 'Search %s', BP_COMP_TEXTDOMAIN ), BP_COMP_PLURAL_NAME ),
-        'all_items'         => sprintf( __( 'All %s', BP_COMP_TEXTDOMAIN ), BP_COMP_PLURAL_NAME ),
-        'parent_item'       => sprintf( __( 'Parent %s', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
-        'parent_item_colon' => sprintf( __( 'Parent %s:', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
-        'edit_item'         => sprintf( __( 'Edit %s', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
-        'update_item'       => sprintf( __( 'Update %s', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
-        'add_new_item'      => sprintf( __( 'Add New %s', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
-        'new_item_name'     => sprintf( __( 'New %s Name', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ),
+        'search_items'      => sprintf( __( 'Search %s', 'bp-compliments' ), BP_COMP_PLURAL_NAME ),
+        'all_items'         => sprintf( __( 'All %s', 'bp-compliments' ), BP_COMP_PLURAL_NAME ),
+        'parent_item'       => sprintf( __( 'Parent %s', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
+        'parent_item_colon' => sprintf( __( 'Parent %s:', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
+        'edit_item'         => sprintf( __( 'Edit %s', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
+        'update_item'       => sprintf( __( 'Update %s', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
+        'add_new_item'      => sprintf( __( 'Add New %s', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
+        'new_item_name'     => sprintf( __( 'New %s Name', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ),
         'menu_name'         => BP_COMP_SINGULAR_NAME,
     );
 
@@ -84,13 +84,13 @@ function compliments_enqueue_admin_js( $hook_suffix ) {
 function compliments_taxonomy_add_new_meta_field() {
     ?>
     <div class="form-field form-required caticon-upload upload">
-        <label for="term_meta[compliments_icon]"><?php echo sprintf( __( '%s Icon', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ) ?></label>
+        <label for="term_meta[compliments_icon]"><?php echo sprintf( __( '%s Icon', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ) ?></label>
         <img id="comp-icon-preview" class="image_preview" src="" style="display: none;" /><br/>
         <input id="comp-icon-value" style="position:absolute; left:-500px;width:50px;" class="image_data_field" type="text" name="term_meta[compliments_icon]" value=""/>
-        <input id="comp-icon-upload" type="button" data-uploader_title="<?php echo __( 'Upload Icon' , BP_COMP_TEXTDOMAIN ); ?>" data-uploader_button_text="<?php echo __( 'Use Icon' , BP_COMP_TEXTDOMAIN ); ?>" class="image_upload_button button" value="<?php echo __( 'Upload new Icon' , BP_COMP_TEXTDOMAIN ); ?>" />
-        <input id="comp-icon-delete" type="button" class="image_delete_button button" value="<?php echo __( 'Remove Icon' , BP_COMP_TEXTDOMAIN ); ?>" />
+        <input id="comp-icon-upload" type="button" data-uploader_title="<?php echo __( 'Upload Icon' , 'bp-compliments' ); ?>" data-uploader_button_text="<?php echo __( 'Use Icon' , 'bp-compliments' ); ?>" class="image_upload_button button" value="<?php echo __( 'Upload new Icon' , 'bp-compliments' ); ?>" />
+        <input id="comp-icon-delete" type="button" class="image_delete_button button" value="<?php echo __( 'Remove Icon' , 'bp-compliments' ); ?>" />
         <br/>
-        <p><?php echo __( 'Recommended icon size: 20px x 20px' , BP_COMP_TEXTDOMAIN ); ?></p>
+        <p><?php echo __( 'Recommended icon size: 20px x 20px' , 'bp-compliments' ); ?></p>
     </div>
 <?php
     bp_compliments_taxonomy_highlight_js();
@@ -108,15 +108,15 @@ function compliments_taxonomy_edit_meta_field($term) {
     $t_id = $term->term_id;
     $term_meta = get_option( "taxonomy_$t_id" ); ?>
     <tr class="form-field form-required">
-        <th scope="row" valign="top"><label for="term_meta[compliments_icon]"><?php echo sprintf( __( '%s Icon', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ) ?></label></th>
+        <th scope="row" valign="top"><label for="term_meta[compliments_icon]"><?php echo sprintf( __( '%s Icon', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ) ?></label></th>
         <td>
 		    <span class='caticon-upload upload'>
                 <input id="comp-icon-value" style="position:absolute; left:-500px;width:50px;" class="image_data_field" type="hidden" name="term_meta[compliments_icon]" value="<?php echo esc_attr( $term_meta['compliments_icon'] ) ? esc_attr( $term_meta['compliments_icon'] ) : ''; ?>"/>
                 <img id="comp-icon-preview" class="image_preview" src="<?php echo esc_attr( $term_meta['compliments_icon'] ) ? esc_attr( $term_meta['compliments_icon'] ) : ''; ?>" /><br/>
-                <input id="comp-icon-upload" type="button" data-uploader_title="<?php echo __( 'Upload Icon' , BP_COMP_TEXTDOMAIN ); ?>" data-uploader_button_text="<?php echo __( 'Use Icon' , BP_COMP_TEXTDOMAIN ); ?>" class="image_upload_button button" value="<?php echo __( 'Upload new Icon' , BP_COMP_TEXTDOMAIN ); ?>" />
-                <input id="comp-icon-delete" type="button" class="image_delete_button button" value="<?php echo __( 'Remove Icon' , BP_COMP_TEXTDOMAIN ); ?>" />
+                <input id="comp-icon-upload" type="button" data-uploader_title="<?php echo __( 'Upload Icon' , 'bp-compliments' ); ?>" data-uploader_button_text="<?php echo __( 'Use Icon' , 'bp-compliments' ); ?>" class="image_upload_button button" value="<?php echo __( 'Upload new Icon' , 'bp-compliments' ); ?>" />
+                <input id="comp-icon-delete" type="button" class="image_delete_button button" value="<?php echo __( 'Remove Icon' , 'bp-compliments' ); ?>" />
                 <br/>
-                <p><?php echo __( 'Recommended icon size: 20px x 20px' , BP_COMP_TEXTDOMAIN ); ?></p>
+                <p><?php echo __( 'Recommended icon size: 20px x 20px' , 'bp-compliments' ); ?></p>
             </span>
         </td>
     </tr>
@@ -162,8 +162,8 @@ function save_taxonomy_custom_meta( $term_id ) {
 function modify_compliment_columns($columns) {
     $new_columns = array(
         'cb' => '<input type="checkbox" />',
-        'name' => __('Name', BP_COMP_TEXTDOMAIN),
-        'icon' => __('Icon', BP_COMP_TEXTDOMAIN),
+        'name' => __('Name', 'bp-compliments'),
+        'icon' => __('Icon', 'bp-compliments'),
     );
     return $new_columns;
 }
diff --git a/includes/bp-compliments-templatetags.php b/includes/bp-compliments-templatetags.php
index 13ebf03..78be3c2 100644
--- a/includes/bp-compliments-templatetags.php
+++ b/includes/bp-compliments-templatetags.php
@@ -80,7 +80,7 @@ function bp_compliments_get_add_compliment_button( $args = '' ) {
      * @param string $receiver_fullname Receiver full name.
      * @param int $r['receiver_id'] Receiver ID.
      */
-    $link_text = sprintf( sprintf( __( 'Send %s', BP_COMP_TEXTDOMAIN ), BP_COMP_SINGULAR_NAME ), apply_filters( 'bp_compliments_receiver_name', bp_get_user_firstname( $receiver_fullname ), $r['receiver_id'] ) );
+    $link_text = sprintf( sprintf( __( 'Send %s', 'bp-compliments' ), BP_COMP_SINGULAR_NAME ), apply_filters( 'bp_compliments_receiver_name', bp_get_user_firstname( $receiver_fullname ), $r['receiver_id'] ) );
 
     if ( empty( $r['link_text'] ) ) {
         $r['link_text'] = $link_text;
diff --git a/includes/templates/buddypress/members/single/compliments.php b/includes/templates/buddypress/members/single/compliments.php
index 060754e..4aab2d2 100644
--- a/includes/templates/buddypress/members/single/compliments.php
+++ b/includes/templates/buddypress/members/single/compliments.php
@@ -85,7 +85,7 @@ class='preview-upload'/>
                                 $receiver_url    = bp_core_get_userlink( $comp->receiver_id, false, true );
                                 $compliment_url = $receiver_url . $bp->compliments->id . '/?c_id='.$comp->id.'&action=delete';
                                 ?>
-                                <a href="<?php echo $compliment_url; ?>" class="button item-button confirm" style="float: right;"><?php echo __('Delete', BP_COMP_TEXTDOMAIN); ?></a>
+                                <a href="<?php echo $compliment_url; ?>" class="button item-button confirm" style="float: right;"><?php echo __('Delete', 'bp-compliments'); ?></a>
                             <?php } ?>
                         </div>
                         <div class="comp-user-msg-wrap">
@@ -117,10 +117,10 @@ class='preview-upload'/>
         if (($total > $items_per_page) && !$c_id) { ?>
             <div id="pag-top" class="pagination">
                 <div class="pag-count" id="member-dir-count-top">
-                    <?php echo sprintf(_n('1 of 1', '%1$s to %2$s of %3$s', $total, BP_COMP_TEXTDOMAIN), $start, $end, $total); ?>
+                    <?php echo sprintf(_n('1 of 1', '%1$s to %2$s of %3$s', $total, 'bp-compliments'), $start, $end, $total); ?>
                 </div>
                 <div class="pagination-links">
-                    <span class="bp-comp-pagination-text"><?php echo __('Go to Page', BP_COMP_TEXTDOMAIN) ?></span>
+                    <span class="bp-comp-pagination-text"><?php echo __('Go to Page', 'bp-compliments') ?></span>
                     <?php
                     echo paginate_links(array(
                         'base' => esc_url(add_query_arg('cpage', '%#%')),
@@ -136,20 +136,20 @@ class='preview-upload'/>
     } elseif($bp_compliment_can_see_others_comp == 'no') {
         ?>
         <div id="message" class="bp-no-compliments info">
-            <p><?php echo __('You don\'t have permission to access this page.', BP_COMP_TEXTDOMAIN); ?></p>
+            <p><?php echo __('You don\'t have permission to access this page.', 'bp-compliments'); ?></p>
         </div>
     <?php
     } else {
         if (bp_displayed_user_id() == bp_loggedin_user_id()) {
             ?>
             <div id="message" class="bp-no-compliments info">
-                <p><?php echo sprintf( __( 'Aw, you have no %1$s yet. To get some try sending %1$s to others.', BP_COMP_TEXTDOMAIN ), strtolower(BP_COMP_PLURAL_NAME) ); ?></p>
+                <p><?php echo sprintf( __( 'Aw, you have no %1$s yet. To get some try sending %1$s to others.', 'bp-compliments' ), strtolower(BP_COMP_PLURAL_NAME) ); ?></p>
             </div>
         <?php
         } else {
             ?>
             <div id="message" class="bp-no-compliments info">
-                <p><?php echo sprintf( __( 'Sorry, no %1$s just yet.', BP_COMP_TEXTDOMAIN ), strtolower(BP_COMP_PLURAL_NAME) ); ?></p>
+                <p><?php echo sprintf( __( 'Sorry, no %1$s just yet.', 'bp-compliments' ), strtolower(BP_COMP_PLURAL_NAME) ); ?></p>
             </div>
         <?php
         }
diff --git a/languages/bp-compliments-en_US.mo b/languages/bp-compliments-en_US.mo
index 147ee53..9cd860e 100644
Binary files a/languages/bp-compliments-en_US.mo and b/languages/bp-compliments-en_US.mo differ
diff --git a/languages/bp-compliments-en_US.po b/languages/bp-compliments-en_US.po
index ae2f559..37d4551 100644
--- a/languages/bp-compliments-en_US.po
+++ b/languages/bp-compliments-en_US.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: BuddyPress Compliments 0.0.6\n"
-"POT-Creation-Date: 2015-08-22 22:07+0530\n"
-"PO-Revision-Date: 2015-08-22 22:07+0530\n"
+"Project-Id-Version: BuddyPress Compliments 0.0.8\n"
+"POT-Creation-Date: 2015-09-03 20:38-0000\n"
+"PO-Revision-Date: 2015-09-03 20:38-0000\n"
 "Last-Translator: \n"
 "Language-Team: GeoDirectory <info@wpgeodirectory.com>\n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.1\n"
+"X-Generator: Poedit 1.7.5\n"
 "X-Poedit-Basepath: ../\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-KeywordsList: __;_e;_n:1,2;_x\n"