Refactoring/renaming for header-only implementation branch