change naming convention and fixing a bug