Moved stuff from tValues to tNames layer