Undo regression typo in building
change init fields to all start with i