Streamline legacy model names