Simplify naming a little, make methods more consistent.