* Fix Citybikes naming. * Semantic fixes upon requests. Entity ID generation now includes the base name (again), resulting in preservation of the entity ID format (the change is non-breaking) * Use `async_generate_entity_id`.