More serious renaming and commenting for the pub.