Fixed naming issues and parsing issues.