diff --git a/openmrs/omod/src/main/java/org/openmrs/projectbuendia/webservices/rest/DbUtil.java b/openmrs/omod/src/main/java/org/openmrs/projectbuendia/webservices/rest/DbUtil.java
index d281c845..6b035397 100644
--- a/openmrs/omod/src/main/java/org/openmrs/projectbuendia/webservices/rest/DbUtil.java
+++ b/openmrs/omod/src/main/java/org/openmrs/projectbuendia/webservices/rest/DbUtil.java
@@ -97,8 +97,8 @@ public static Concept getOrderExecutedConcept() {
                 "Order executed",
                 // The OpenMRS "uuid" field is misnamed; OpenMRS uses the field for
                 // arbitrary string IDs unrelated to RFC 4122.  Therefore, to prevent
-                // collisions, UUIDs specific to this module are prefixed "buendia.".
-                "buendia.concept.order_executed",
+                // collisions, UUIDs specific to this module are prefixed "buendia-".
+                "buendia-concept-order_executed",
                 "N/A",
                 "Finding");
     }
diff --git a/openmrs/omod/src/main/java/org/openmrs/projectbuendia/webservices/rest/OrderResource.java b/openmrs/omod/src/main/java/org/openmrs/projectbuendia/webservices/rest/OrderResource.java
index a6d8d0d7..9a104324 100644
--- a/openmrs/omod/src/main/java/org/openmrs/projectbuendia/webservices/rest/OrderResource.java
+++ b/openmrs/omod/src/main/java/org/openmrs/projectbuendia/webservices/rest/OrderResource.java
@@ -72,7 +72,7 @@ public class OrderResource implements Listable, Searchable, Retrievable, Creatab
     static final User CREATOR = new User(1);  // fake value
     static final RequestLogger logger = RequestLogger.LOGGER;
     static Log log = LogFactory.getLog(OrderResource.class);
-    static final String FREE_TEXT_ORDER_UUID = "buendia.concept.free_text_order";
+    static final String FREE_TEXT_ORDER_UUID = "buendia-concept-free_text_order";
 
     final PatientService patientService;
     final OrderService orderService;
diff --git a/tools/profile_apply b/tools/profile_apply
index 15611d5a..7f63b37b 100755
--- a/tools/profile_apply
+++ b/tools/profile_apply
@@ -188,7 +188,7 @@ def apply(tabs):
 
     def apply_charts(rows):
         chart_layout = get_or_insert(
-            'encounter_type', name='buendia.chart_layout',
+            'encounter_type', name='buendia-chart_layout',
             description='Buendia: patient chart layout definition')
         for chart_rows in split_by_title(rows):
             put_chart(chart_rows)
@@ -277,7 +277,7 @@ def apply(tabs):
         adult_return = db.get('encounter_type_id', name='ADULTRETURN')
 
         title = rows[0]['title']
-        uuid = 'buendia.form.' + re.sub('[\W_]+', '_', title.lower()).strip('_')
+        uuid = 'buendia-form-' + re.sub('[\W_]+', '_', title.lower()).strip('_')
         form_id = db.get('form_id', uuid=uuid)
         if not form_id:
             form_id = odb.insert('form', name=title, version='1',