Fixed usage and error message identifiers.