Changed Names and corrected bugs