Fix broken Format Spec and rename