Naming Issue Fixes