code gardening - use more feature specific names for the source symbol navigation feature types
fix merge gone wrong and more