Replaced Nova w/ YAC

Did some basic name cleanup of the code.