Changed some symbol names and documentations