Fixed naming standards