Changes name
Fixes conditional location