Renamed record_dao, record_model, record_collection to be entity_record_dao, entity_record_model, entity_record_collection, same for links.