design changes, naming