Naming refactor folowing convention.