fixed subvariable naming