renaming and adjusting Model to Modal