fix naming clash and add guid generation and coalesce