diff --git a/data/config.default.inc.php b/data/config.default.php
similarity index 100%
rename from data/config.default.inc.php
rename to data/config.default.php
diff --git a/data/config.inc.php.dist b/data/config.php.dist
similarity index 100%
rename from data/config.inc.php.dist
rename to data/config.php.dist
diff --git a/src/SemanticScuttle/Service/bookmarkservice.php b/src/SemanticScuttle/Service/Bookmark.php
similarity index 100%
rename from src/SemanticScuttle/Service/bookmarkservice.php
rename to src/SemanticScuttle/Service/Bookmark.php
diff --git a/src/SemanticScuttle/Service/bookmark2tagservice.php b/src/SemanticScuttle/Service/Bookmark2tag.php
similarity index 100%
rename from src/SemanticScuttle/Service/bookmark2tagservice.php
rename to src/SemanticScuttle/Service/Bookmark2tag.php
diff --git a/src/SemanticScuttle/Service/cacheservice.php b/src/SemanticScuttle/Service/Cache.php
similarity index 100%
rename from src/SemanticScuttle/Service/cacheservice.php
rename to src/SemanticScuttle/Service/Cache.php
diff --git a/src/SemanticScuttle/Service/commondescriptionservice.php b/src/SemanticScuttle/Service/CommonDescription.php
similarity index 100%
rename from src/SemanticScuttle/Service/commondescriptionservice.php
rename to src/SemanticScuttle/Service/CommonDescription.php
diff --git a/src/SemanticScuttle/Service/servicefactory.php b/src/SemanticScuttle/Service/Factory.php
similarity index 100%
rename from src/SemanticScuttle/Service/servicefactory.php
rename to src/SemanticScuttle/Service/Factory.php
diff --git a/src/SemanticScuttle/Service/searchhistoryservice.php b/src/SemanticScuttle/Service/SearchHistory.php
similarity index 100%
rename from src/SemanticScuttle/Service/searchhistoryservice.php
rename to src/SemanticScuttle/Service/SearchHistory.php
diff --git a/src/SemanticScuttle/Service/tagservice.php b/src/SemanticScuttle/Service/Tag.php
similarity index 100%
rename from src/SemanticScuttle/Service/tagservice.php
rename to src/SemanticScuttle/Service/Tag.php
diff --git a/src/SemanticScuttle/Service/tag2tagservice.php b/src/SemanticScuttle/Service/Tag2tag.php
similarity index 100%
rename from src/SemanticScuttle/Service/tag2tagservice.php
rename to src/SemanticScuttle/Service/Tag2tag.php
diff --git a/src/SemanticScuttle/Service/tagcacheservice.php b/src/SemanticScuttle/Service/TagCache.php
similarity index 100%
rename from src/SemanticScuttle/Service/tagcacheservice.php
rename to src/SemanticScuttle/Service/TagCache.php
diff --git a/src/SemanticScuttle/Service/tagstatservice.php b/src/SemanticScuttle/Service/TagStat.php
similarity index 100%
rename from src/SemanticScuttle/Service/tagstatservice.php
rename to src/SemanticScuttle/Service/TagStat.php
diff --git a/src/SemanticScuttle/Service/templateservice.php b/src/SemanticScuttle/Service/Template.php
similarity index 100%
rename from src/SemanticScuttle/Service/templateservice.php
rename to src/SemanticScuttle/Service/Template.php
diff --git a/src/SemanticScuttle/Service/userservice.php b/src/SemanticScuttle/Service/User.php
similarity index 100%
rename from src/SemanticScuttle/Service/userservice.php
rename to src/SemanticScuttle/Service/User.php
diff --git a/src/SemanticScuttle/functions.inc.php b/src/SemanticScuttle/functions.php
similarity index 100%
rename from src/SemanticScuttle/functions.inc.php
rename to src/SemanticScuttle/functions.php
diff --git a/src/SemanticScuttle/header.inc.php b/src/SemanticScuttle/header.php
similarity index 100%
rename from src/SemanticScuttle/header.inc.php
rename to src/SemanticScuttle/header.php
diff --git a/src/SemanticScuttle/search.inc.php b/src/SemanticScuttle/search.php
similarity index 100%
rename from src/SemanticScuttle/search.inc.php
rename to src/SemanticScuttle/search.php