1.1.X Naming Conventions for appId/appSecret?

Craig,

I know the 1.1.x API is still in flux. As a result, there are some naming inconsistencies with the appId/appSecret that I'd like to get your take on so that I can better align my API with the direction you are taking. For example:

Twitter
EnableTwitter - appId, appSecret
TwitterConnectionFactory - consumerKey, consumerSecret
TwitterServiceProvider - consumerKey, consumerSecret


Facebook
EnableFacebook.java - appId, appSecret
FacebookConnectionFactory - appId, appSecret
FacebookServiceProvider - appId, appSecret


LinkedIn
EnableLinkedIn.java - appId, appSecret
LinkedInConnectionFactory - consumerKey, consumerSecret
LinkedInServiceProvider - accessToken, secret


OAuth2Template - clientId, clientSecret

Based on the Facebook API, it looks like you are moving to use appId/appSecret. Is this where you are going?