cleanup: Renamed a couple resources for consistency.