spring beans naming consistency fix