Make .names a tuple and remove 'constants' from it