change method names to be consistent