Change bean names for consistency