Renaming and empty data fix