Make naming consistent regarding synchronization