updating naming and bug fixing