renamed some parameters to more fitting names