Use simpler goal identifiers

Updated documentation

Minor change to the itest file