Cleanup naming conventions