Fix JSF naming