Refactoring for usage with techdivision/naming package