Update bean names so they're autowired properly