Alignment fixes and member naming