fix custom-set naming convention problems