Modified ID

Change the ID tag so it is all capitals nad underscores.
Remove leading underscores from ID.