Fixed a few naming issues
Ready for Mutahir UI upgrade