make workspace more flexible, fix instantiation naming error