Final adjustments

Changed some naming conventions to finalize the assignment