fixing some naming issues in beans