Updated dir naming.