Various small changes to begin rebranding