Changed button naming to something useful