Another minor change I swear... (naming conventions)