moved typename routines to namespace Makros