changed names according to requirement