Fixed naming rule