Weight -> w
More consistent file/test names