More cleanup and setting up strong naming.