Used correct identifiers (WWW-1536)