Made variable names of components more descriptive