finishing up model name changes