renamed armories to armoires