Implement action and namespace fix