rename aggregatelock dir -> lock