Cleanup naming for public consumption