Fixed naming, string issues