Fixed compile errors due to name changes, updated comments