cleanup predefined error URIs; split out some into AP; systematic naming