Additional spacing / naming updates