Updated extension annotations referring to CAPEC and MAEC