More refactoring with standardized bean naming