Starting to think about synchronization
Minor name changes