Minor renaming and moving changes