Merge "Correcting naming format"