Changed component id types to use enums rather than #defines