rename namespace; fix regex