Made some more things static, and other cleanup for new naming scheme