Updated some file and function names
More cleanup