Name Fixes

Fixed old name in some files