Rename identifiers according to issue #10