Rename load_sources to load-sources. Make code fixes according to @tadatuta notations