Remove hardcoding
Rename