Fixed naming bugs