Added naming module