Fixing naming a bit.