Fixing some simple, silly naming issues.