diff --git a/smithy-aws-protocol-tests/model/awsJson1_0/main.smithy b/smithy-aws-protocol-tests/model/awsJson1_0/main.smithy
index bc9e29180f5..091a5c93bfc 100644
--- a/smithy-aws-protocol-tests/model/awsJson1_0/main.smithy
+++ b/smithy-aws-protocol-tests/model/awsJson1_0/main.smithy
@@ -3,12 +3,15 @@ $version: "2.0"
 namespace aws.protocoltests.json10
 
 use aws.api#service
+use aws.auth#sigv4
 use aws.protocols#awsJson1_0
 use smithy.test#httpRequestTests
 use smithy.test#httpResponseTests
 
 @service(sdkId: "JSON RPC 10")
+@sigv4(name: "jsonrpc10")
 @awsJson1_0
+@title("Sample Json 1.0 Protocol Service")
 service JsonRpc10 {
     version: "2020-07-14",
     operations: [
diff --git a/smithy-aws-protocol-tests/model/awsQuery/main.smithy b/smithy-aws-protocol-tests/model/awsQuery/main.smithy
index ead67221664..4e2c7c513b4 100644
--- a/smithy-aws-protocol-tests/model/awsQuery/main.smithy
+++ b/smithy-aws-protocol-tests/model/awsQuery/main.smithy
@@ -3,14 +3,17 @@ $version: "2.0"
 namespace aws.protocoltests.query
 
 use aws.api#service
+use aws.auth#sigv4
 use aws.protocols#awsQuery
 use smithy.test#httpRequestTests
 use smithy.test#httpResponseTests
 
 /// A query service that sends query requests and XML responses.
 @service(sdkId: "Query Protocol")
+@sigv4(name: "awsquery")
 @awsQuery
 @xmlNamespace(uri: "https://example.com/")
+@title("Sample Query Protocol Service")
 service AwsQuery {
     version: "2020-01-08",
     operations: [
diff --git a/smithy-aws-protocol-tests/model/ec2Query/main.smithy b/smithy-aws-protocol-tests/model/ec2Query/main.smithy
index c470437bc1f..8979870fa9d 100644
--- a/smithy-aws-protocol-tests/model/ec2Query/main.smithy
+++ b/smithy-aws-protocol-tests/model/ec2Query/main.smithy
@@ -29,14 +29,18 @@ $version: "2.0"
 namespace aws.protocoltests.ec2
 
 use aws.api#service
+use aws.auth#sigv4
 use aws.protocols#ec2Query
 use smithy.test#httpRequestTests
 use smithy.test#httpResponseTests
 
 /// An EC2 query service that sends query requests and XML responses.
 @service(sdkId: "EC2 Protocol")
+@suppress(["SigV4Traits"])
+@sigv4(name: "ec2query")
 @ec2Query
 @xmlNamespace(uri: "https://example.com/")
+@title("Sample Ec2 Protocol Service")
 service AwsEc2 {
     version: "2020-01-08",
     operations: [
diff --git a/smithy-aws-protocol-tests/model/restJson1/main.smithy b/smithy-aws-protocol-tests/model/restJson1/main.smithy
index 25b59bf8abc..16c779b4f26 100644
--- a/smithy-aws-protocol-tests/model/restJson1/main.smithy
+++ b/smithy-aws-protocol-tests/model/restJson1/main.smithy
@@ -3,13 +3,16 @@ $version: "2.0"
 namespace aws.protocoltests.restjson
 
 use aws.api#service
+use aws.auth#sigv4
 use aws.protocols#restJson1
 use smithy.test#httpRequestTests
 use smithy.test#httpResponseTests
 
 /// A REST JSON service that sends JSON requests and responses.
 @service(sdkId: "Rest Json Protocol")
+@sigv4(name: "restjson")
 @restJson1
+@title("Sample Rest Json Protocol Service")
 service RestJson {
     version: "2019-12-16",
     // Ensure that generators are able to handle renames.
diff --git a/smithy-aws-protocol-tests/model/restXml/main.smithy b/smithy-aws-protocol-tests/model/restXml/main.smithy
index 3865a2ed397..348eb303c82 100644
--- a/smithy-aws-protocol-tests/model/restXml/main.smithy
+++ b/smithy-aws-protocol-tests/model/restXml/main.smithy
@@ -3,13 +3,16 @@ $version: "2.0"
 namespace aws.protocoltests.restxml
 
 use aws.api#service
+use aws.auth#sigv4
 use aws.protocols#restXml
 use smithy.test#httpRequestTests
 use smithy.test#httpResponseTests
 
 /// A REST XML service that sends XML requests and responses.
 @service(sdkId: "Rest Xml Protocol")
+@sigv4(name: "restxml")
 @restXml
+@title("Sample Rest Xml Protocol Service")
 service RestXml {
     version: "2019-12-16",
     operations: [
diff --git a/smithy-aws-protocol-tests/model/restXmlWithNamespace/main.smithy b/smithy-aws-protocol-tests/model/restXmlWithNamespace/main.smithy
index 33c2608da91..7550899264a 100644
--- a/smithy-aws-protocol-tests/model/restXmlWithNamespace/main.smithy
+++ b/smithy-aws-protocol-tests/model/restXmlWithNamespace/main.smithy
@@ -3,6 +3,7 @@ $version: "2.0"
 namespace aws.protocoltests.restxml.xmlns
 
 use aws.api#service
+use aws.auth#sigv4
 use aws.protocols#restXml
 use smithy.test#httpRequestTests
 use smithy.test#httpResponseTests
@@ -15,8 +16,10 @@ use smithy.test#httpResponseTests
 ///
 /// See https://github.com/awslabs/smithy/issues/616
 @service(sdkId: "Rest Xml Protocol Namespace")
+@sigv4(name: "restxmlwithnamespace")
 @xmlNamespace(uri: "https://example.com")
 @restXml
+@title("Sample Rest Xml Protocol Service With Namespace")
 service RestXmlWithNamespace {
     version: "2019-12-16",
     operations: [SimpleScalarProperties]