more concise naming of sinks and stores, order config file settings in a clearer order