Updates to Adapter comments and function names