placeholders for 'derived' units; fix some unit names