Minim renaming to allow compilation and work on code base.