Apply signal mask solution for the remaning mutexs

Signed-off-by: Vinicius Tinti <viniciustinti@gmail.com>
Use better naming for the lock

Signed-off-by: Vinicius Tinti <viniciustinti@gmail.com>