updated files and followed proper naming