made method names more consistent