Property names fixing