renamings to get ready for Variable unit tests