Switch method names up to clarify
Fixing comment table issues