fixed bugs due to liberal use of identifierName instead of identifier