Fixed some name issues, tests failing.