Rename method and make return value more useful