modify build system to support names