Fix feature identifiers and names