Fixed repeating of code and some name changes