Add force option to build and naming improvements.