Fix bean property names