Cleanup naming in all