Add correct bean names