Fixed issue with the system property naming: