Remove a few inconsistant namings and fix comments