Added Component NAME generation. Fixes #3