Fix builder script and rename to generic