more internal renames
more internal renames


SVN revision: 64215

rvandegrift/elementary,tasn/elementary,rvandegrift/elementary,FlorentRevest/Elementary,rvandegrift/elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,rvandegrift/elementary,tasn/elementary,tasn/elementary,tasn/elementary,tasn/elementary