Small renaming, comment issues