refactoring naming from complex types to collections