More renaming

Always use whole, real words!