Rename MODELS and cleanup lint