Fixed naming on as pattern