Switched to consistent protocol naming convention everywhere. Cleaned up some more record access.