Replaced some C<...> fragments to L<...> fragments