Fixed over-eager renaming
Added records