Remove ?MODULE and replace with proper tag