spec fixes to use qualified identifiers