[Update] Minor fixes to some code spelling
[Update] Modifications to remove lengthy qualified names