Resolving tech debt. Naming conventions.