Fixes in records names we are looking for