Make method names slightly more accurate to their current purpose