Take PUBLIC_NAME into account