Fix naming issues, use of symbols in place of string, method broken