> would it be better to change them and also address the comment about the unnecessary variables in the builders in a separate PR, to 
> get all them cleaned up?

I don't think that's necessary unless you feel it's important. If that's the current convention for _multiple_ Abiquo classes, fine to leave as-is. I was just thinking that this might be an outlier...