style, naming updates