cleanup naming conventions