Clean up naming, etc.