Simplify bean naming