Naming changes, button implementations