diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/hsdomainmodel/src/hswidgetcomponent.cpp
--- a/homescreenapp/hsdomainmodel/src/hswidgetcomponent.cpp	Wed Aug 18 09:40:07 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hswidgetcomponent.cpp	Thu Sep 02 20:17:27 2010 +0300
@@ -123,19 +123,19 @@
 void HsWidgetComponent::resolveRootPathAndTranslationFilename()
 {
 	CaQuery query;
-    query.setEntryTypeNames(QStringList(widgetTypeName()));
-	query.setAttribute(widgetUriAttributeName(), mUri);
+    query.setEntryTypeNames(QStringList(Hs::widgetTypeName));
+	query.setAttribute(Hs::widgetUriAttributeName, mUri);
 	QList< QSharedPointer<CaEntry> > widgetEntries = CaService::instance()->getEntries(query);
 	
     if (widgetEntries.isEmpty()) {
         return;
 	}
     QSharedPointer<CaEntry> entry = widgetEntries.first();
-    mRootPath = entry->attribute(widgetPathAttributeName());
+    mRootPath = entry->attribute(Hs::widgetPathAttributeName);
     if (mRootPath.isEmpty() || !QDir(mRootPath).exists()) {
         mState = Unavailable;
     } else {
-        mTranslationFilename = entry->attribute(translationFilename());
+        mTranslationFilename = entry->attribute(Hs::translationFilename);
     }
 }