Requests for comment/API Future/Naming Cleanup