Minor Fixes

Minor name fixes