Fixed names
Fixed names & Added Login functions